many additions, including settings panel