Content added, optimizations, code cleanup