minor tweaks
cleanup of the main method
bug fixes for JPTSMeta30
manual fixing of merge