Final fixes

final product of the project, done