Finished Tool overlay, fixed locals and saving