Fixed Output and some Algorithm stuff - but not completely yet