now this is better. :)

Removed translation, tightened up a few things
more cleanup