fixed bugs. ready for presentation