Fixed a few loose ends. Tools GUI still needs work.
Fixed toggle