Cleaned the source a bit and fixed some interactions