Cleaned up and added FIXME and TODO