fix rake tasks, reorder require chain, ui improvements