Fixed Minor Problems from first Commit