added Suggestions and fixed isseues

Thanks to Daniel Baggio and sutr90 for improvements