more dark tower fixes plus some fixes in the main section. i've tried to separate them.