cleaned up more little things and added TODO/disclaimer