bs
bs
bs
bs
bs
bs
bs
more notes ported, move entry meta