few bugs resolved in basic functionality