Added and fixed some things