Don't look!

minor, half finished changes