fixes economy; minor bugfixes