Small fixes

* did some minor cleaning
* added the pc testing emulator