Added missing shortcuts
WIP angle distance calculations