Fixed a few bugs
Merge pull request #48 from alexmohr/uplink

Fixed a few bugs