More additions from inuit. Also finalized using px for variables and sticking to conventions in inuit framework.