Ver 0/1/7. Code formating and minor changes.