Bug fixes and added author