cleanup and i vs. ii variable stuff fixed