bugfixes and removed serial