-fixed bugs and made some progress