Pull suggestions

Fix rake run and incorporate suggestions from pull feedback.