4th

Added some bug fixes