Added and fixed more stuff