fixing erroneous use of property and minor bugs