bugfixing
bugfixing - now feature complete, compiling