Mostlly fixes - giving it a try.