Comments and stuff added