fixed minor stuff on final version