fixing more bugs?