major fix and enhancement and add media player