fixed bugs and feedback