Fixed small bug that arose from last commit. Also added in some visual cues to show the user which tool they're using.