more tweaks
More minor Tweaks

made year dynamic