lots of bug fixes for canobie app