small tweaks, and include order