Various bugfixes; Added more configurable items