major improvements and added local images