Swomma changes, input validation