V-0.22

Cleaned up the code and added comments to different sections