fixed img url for dev
fixed names and added some @todo
merged with master