several bugs addressed