fixed bugs and worked on fixing stuck issues