General updates/ Some bugs fixed