Add initial tweaks and extensions