misc. accumulated changes from happierface