Pushing some tweaks to the branch