update

BUGS AND INCOMPLETE IMPLEMENTATIONS