- Fixed errors introduced after fun/var rename
- Added code to kill orphaned lock files