Bug fixes and modifications..