Finishing a bit mored
lots o changes picked up