bug fixes & renamed module