fixed bugs and other existing issues