add more policies, fix nasty bug