updated a few more bugs