colored boxes updated

and general cleanup