Fix small bugs and finish!!!!! wooohooo!!