Cleanup, fixes, new elements