Separating objects a bit, some bugfixes implemented