fixes varios
fixes varios2
Merge pull request #3 from DiegoUX/fixesAndrea

Fixes andrea