Adjusting defaults, removing singletons, refactoring sortable