Few bug fixes, both apps largely complete