retouched a few things here and there, still working on it