Version: 0.6

Overall bug fixes and changes.