several tiny bugs
cleanup codebase
rearranged methods