More bug fixes
Some more stuff