Finished option a

Option a should be fully complete. Also some variable names and
declarations should be improved.