Small clean-up
Silver perfection changes
Some fixes