Bug fixes, lil' things - 1.0