Minor changes such as adding //FIXME to certain areas.