fixin' some bugs