Bug with score fixed
Minor Update

Restructured some parts