cleaner patch
some updates to support nokia 5800