tie in of rake, bug fix and more specs