Merge branches from not working to working.

This pull would merge all changes made by me to the inik repo in turn making that repo up to date, working, and have all proper code changes.