- bug fixes (still many)