Update code around figures

references #23