Fixes style issues. Adds missing files