Changed aside and other tweaks

Changed aside and other tweaks