Some quick fixes: added header and made things nicer