Tags in separate file, other improvements