Some more bugs and there are more to fix