buggie fixes, probably ready now