end to end working fine, multiple bugs fixed