A few debugs and updates

Enjoy.