finished policies; did more refactorings