Motox dalvik patch and touchups