fixed some story issues, make it better