Properties fixed, working