Stacked

A few issues resolved