edited a few things, added in some initial data