Bug fixes and changed the way uses work.
Merge pull request #1863 from ComicIronic/MechanicPort

Bug fixes and changed the way uses work.