Preparing for future edits and fixing pinque and some other stuff.