Minor changes, still needs docs