resolved bugs and comments