handle single items better
remake everything, hopefully for the last time today :)