frontend and minor edits...I think?