Refinements after first working print

Mount was too tight, cups are now larger, improve structure of things