fixed bugs and issues