some additions
fixed dumb mistake