BigChick: 30-dec update

fixed minor bugs