Still bug corrections... Tests continue :)