fixes, added more data and commands