bug fix and work forms