Added and tweaked more stuff