fixing bugs that I only created today