reworked rakefile