Fix a few buglets
Update supply list