Couple of things

Finishing development for tonight