fixed previous issues after long break ;)