mhhh

Some changes to match rails conventions, etc