V1.00

some cleanup