Some bugs fixed, still things to test