some updates, new flags, some fixes