Minor bugs removed + refactoring