Bugs fixed. ready to work on upgrades