fixed some bookkeeping and commented out function that is not ready yet