Some fixes and commit test.
dagronlund@gmail.com