several tweaks and updates