fixed bugs and created new features