Some cleanup and better toggle behaviour. Failed to find bug regarding drawing in ol3