Cleaned up, added bezels, external interface, etc