Add module definition
Two bug fixes