minor dict changes and more rules