changed negative calculation and some constants