Some stuff. Bug fixes and thigns.