Properties and stuff - Minor commit