fixes and finish project