bug squashing and minor updates