Tested and fixed bugs, added descriptions