added integers

and some bug fixes