[edit] Minor changes, still haven't compiled to test yet