fixin' bugs