fixed two bugs while testing
Merge branch 'dev' of github.com:magwitch324/wpi-suite into dev