renamed stuff for better readability
fixed image persistance bug

fixes #18