stability fixes
lots more bug fixes