a few small updates and bug fixes