fixed the offset-bug, started solution for other problems aswell