Added/fixed more stuff