* fixed recent issues - ready for testing