fixin bugs