Little update

Some bugs fixed