Fixing some stuff, bugging others