Made the prog awesomer by fixing some return values