More Litle fixes and cleanup.