adding some bug fixes