Fixes & better code