more bugs fixed/discovered