Rect displacement WIP
Optimisations & Bugfixing