Some work on bins, fix tank bug