major and multiple bug fixes, refactoring, etc.