Fix various bugs so that the applications 'works' again -- additional work must be done.