fixed bugs on final project