minor changes - nothing finished yet