methods improvements and bug fixes