Bugs fixed atleast