fix bugs till 20th functionallity