draft script complete
bug fixes