fixed a couple of warnings, now interface looks much nicer