Various short work and general review

Property checks are added and prints are modified.