Bugfix and enhanced door options