Added and fixed stuff