Worked a bit to fix switches and clock drawing and placeholders