fixed a few bugs, made a few more. Progressing slowly.