Better token/train selector, prepared for new train types, minor bug fixes and general cleanup