Alpha v13

Some misc edits and testing to help improve code, :)