Various changes
fixes for presentation