fixed some constants, better looking behaviour