More plots code + library cleanup