bug fixes and new fundtionality
bug fixes and new functionality