More supply stuff and added some missing crap