Updates and Bug fixes