Working on fixing up the last few bugs