Minor fixes

allowed subroutines to have integers in names
fixed deflector_r class name
moved colon to before board name (only two-character names supported)