Update 23

made some fixes