major fixes and updates .. logged 3 hours since last git update.