Fix atoms bonding when they shouldn't, add unbond method, reorg a bit