Many fixes and stuff!