Improved Chicken module handling, bug fixes