Fixes, Edits and More

Lots of changes, should be fully functional now. Only does argument
checking and such, but it's a start.