fixing more bugs from commit