Fixing bugs and whatnot
Additional bug fixes