Added listentype + fixed various bugs