Some bugs fixed :-)