Some updates.
Small bugfix in CheckProperties