finished testing and fixing a few minor issues