Added maxspeed layer, some minor edits