Map patch 4 & General cleanup