Prettied up a few things

The only thing not working perfectly now is chains and cycles.