- fixing bug with hanging on start
 - small adjustments