last changes

Changes I made without many help from others.