Tightening and revisions; onto the Rails stuff now