Version 3. Bug fixes and Aesthetics