added gravity forms and small tweaks