Splitted up headers; General fixes.