Fixing bugs left and right...