Fixes and Tidying

Fixed a few bugs in the refactored CSS code. Also neatened things up.
CSS now implicitly stores ID, rather than explicitly. It can be found at
css.key.id