Lots of little fixes today! - hangarpanic | Upit