* Changes and stuff

Signed-off-by: Miguel Dias Gomes <mdg@uninova.pt>