fixed some basic mode bugs now
minor tweaks