Bug fixes and little features added