Few more tweaks after seeing it live