Improved movement indicators fixes #24