Minor fixes before going on #13