Fixed stupidity and hacks :star2: