more methods implemented & some issues fixed