New features, bug fixes, code cleanup