Update syntax, remove debug code, add file with aruba definitions