Cleanups and buggfixes