working
bug fixes