Renamed files. Added more validations (no symbols, etc). Various bug
fixes.