Bug fixes ... stable version

error bugs fixed ... and some other stuff