Additional Fixes, but currently have Clock Problem