subscribe bug fixed
a lot of bugfixes