several changes to make everything work properly