rake develop + other minor refactorings