Dev 0.3

Small fixes