bug fixes to general app