Better in game feedback. Fixes #12