Code updates and small interaction items added