Minor bugs fixed in lab
Started testing at lab and debuggin