Fix'd some problems