start some bug fixes