fixed up more bugs!