refactored editing
bug fixes; builds