Fixed up property names, string to int conversion, stuff