added more features
bug fixes