Fixed maker tools and added deselecting of markers on tool change