Szybki TK 2.0.4

Major bug fixes

Minor bug fixes