Implement bits for mvp; minor cleanup