Minor commit 3

Updated some stuff plus commented for first major commit later on