Added some options + some renaming.