tons of little design fixes to POM