Slew of comments, added CSF manipulation, new test and travis