A few more bugs need to be fixed!