Fixes all warnings; unmerges master branch (temporarily - will organize soon)