some updates... see commits