bugs fixed, code refactored