Fixes and clean up
Merge branch 'master' of github.com:soal/SlPort