Refactoring, more GUI improvements, etc.