added the other bins, fixes small issues