finalized stuff in core module