runkos ready to run
minor changes, fixes
resolved merge conflict