READY FOR MAR

final tweaks. Looked over critical piece of code