Added todo regarding fs, some other small syntax updates.