fixing problems, finish desinging