updates from Kra1o5's repo