little changes

minor changes
little changes

shifted the function calling of load properties