Misc dev

Variables added