work2
bug fixes