Fixes and reformatting.
Work on JCE-ification.