bug fixes and other needed updates