After some polish, some paint and some tiny fixes