Updates, fixes and improvements. Still in pretty early (but working)
development stage so I will not describe all the changes here