Made some minor updates, added more documentation