STN Updates

File clean up and minor bug fixes.