finish problems 2 and 3
comment code && moar memory clearup