bug fixes remaining