added stat props, fixed minor bugs