fixed stuff and niced it up