Finished fixing bugs related to updated markup
tweaks