added initialisation options, and did some fixes