Various fixes to style and to make run