Straightened out targets logic.
Updated Rakefile.