small fixes
try to make heroku happy
try to make heroku happy
pictures service refactoring