A few minor updates

Less warnings in the project. Added variable names to typedefs for nice XCode code expansion when expanding block pills.