Many fixes/improvements
Many fixes/improvements, code overwork