finished everything and fixed minor problems