UTF-8 for gradle build
orders stuff+minor fixes