major fixes and improvements -- should be ready for production now