more fixies and cleen up