Finishing merge of #144, still some small scrolling bugs that need to be worked out