Cleaned up, updated, and bugfixed fw plugin