property module added and settings refactored