Several changes, php fix, properties escaped