clean up, fixed scripts addresses, better method naming