rake completion and some fixes