Bug fixes

* Removed all FING related code
* Fixed #179, #184 and #185