unit testing fw done; minor checks and polishes