fix resource path
fix crashes
update