Overflow

Had some overflow problems. Fixed them here.