bugfixes and shop additions