Bug fixes, two new instruments

Fixed various bugs and added Newport ESP-301 and SRS DG645