Fixes, First EPG Implementation