general

fixes and re-org