db / mapping improvements and comments