Fix for tickcount overflowing

Implemented the fix that was added some time ago into working code.
Cleaned up handcuffs code, updated maps fs