major overhaul; plenty to clean up, code and content