improving experience a bit

- fixed some overflow problems